-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge misc. MABE2 support branches into MABE_devel #466
Merged
FergusonAJ
merged 146 commits into
devosoft:MABE_devel
from
FergusonAJ:virtual_cpu_merge
Jul 19, 2022
Merged
Merge misc. MABE2 support branches into MABE_devel #466
FergusonAJ
merged 146 commits into
devosoft:MABE_devel
from
FergusonAJ:virtual_cpu_merge
Jul 19, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…stematics tools and record runs
…ng phylodiversity
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
The master branch of MABE2 currently depends on the
MABE_devel
branch of Empirical.This pull request is to merge changes into
MABE_devel
; it does not touch themaster
branch of Empirical.We are supporting the following branches of MABE2:
avida_merge
: https://github.com/FergusonAJ/MABE2/tree/avida_mergesystematics
: https://github.com/emilydolson/MABE2/tree/systematicsThese mostly rely on the following branches of Empirical, which have been merged into this one branch:
virtual_cpu_merge
(this one) : https://github.com/FergusonAJ/Empirical/tree/virtual_cpu_mergemabe-systematics
: https://github.com/emilydolson/Empirical/tree/mabe-systematicsDetails
include/emp/Evolve/Systematics.hpp
andinclude/emp/Evolve/SystematicsAnalysis.hpp
include/emp/hardware/VirtualCPU.hpp
andinclude/emp/hardware/VirtualCPU_InstLib.hpp
)include/emp/hardware/InstLib.hpp
and the files that depend on itinclude/emp/functional/AnyFunction.hpp
,include/emp/meta/TypeID
)include/emp/math/CombinedBinomialDistribution.hpp
that stores multiple instances ofemp::Binomial
to pull random numbers from a binomial distribution with arbitrary N